From ae1bd641bebc1381d04cf3e6157daaabe63a1a17 Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Wed, 26 Nov 2008 19:22:29 +0000
Subject: [PATCH] Make returnto parameter work as well with cookieRedirect

---
 includes/specials/SpecialUserlogin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 2ec5942d05..06e481a7ff 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -926,7 +926,9 @@ class LoginForm {
 		global $wgOut;
 
 		$titleObj = SpecialPage::getTitleFor( 'Userlogin' );
-		$check = $titleObj->getFullURL( 'wpCookieCheck='.$type );
+		$query = array( 'wpCookieCheck' => $type );
+		if ( $this->mReturnTo ) $query['returnto'] = $this->mReturnTo;
+		$check = $titleObj->getFullURL( $query );
 
 		return $wgOut->redirect( $check );
 	}
-- 
2.20.1